add basic search hints
refactor