Fix Doc's curse filter workaround
Fix some parsing errors