removed some stuff I wasn't using, fixed search behaviour