CFY-1231 add missing return statements
CFY-1231 fix parser config