#245 - Start refactoring search using events