Fixes search result ambiguity issue