fixed search to proper