Search refact

Some other queries that go somewhere else.