[#30] Fix stubborn search results