fixed search, added index