Fix incorrect validation
Fix escapes