project search pages refactoring