fix the ticket hanging about past its welcome

remove search and remove query

seems to work okay in practice, but no test yet.