fixed search conflict