Use reference for string to search
Remove unused field