[csjw] Fix issues and improve extraction (closes #13525)