Searching is now finally working correctly