Refactoring, first iteration of live searches