Refactored search lines