Refined search to return correct results