Refactoring: Split out field range search