add raw filter criteria and remove pluralize and singularize