Band search refactoring