Changed up extra criteria to remove encoding issues