fixed things with search, etc