FEC-2577

remove toLowerCase() and use regular expression for the non-case-sensitive search