Search seems to be working quite well now