improving landscape layout search_by filter (code_refactoring)
refining layout and Resolving Conflicts