Added features to search

1. added current search terms to display
2. more refactoring