Search now works
More work towards perfect search