Search line refactoring
minor fix
refactoring