[style] fix indent
[Refactoring] Replace bare flags to descriptive enum names
Merge pull request #3018 from 9rnsr/refactor_search

[Refactoring] Replace bare search flags to descriptive enum names