removed ignore_case to case_sensitive
simplified some expressions