Modified search to use names at any point