globar search refactor
cleanup