fixed search for themse