some more search stuff
minor fixes