search stuff
queries cleanup