improve search to use substrings, close #13