Added uppercase/lowercase string and check for substrings