Was matching on substrings. Changed search