Case 2796 - Changed to new search.
Merge branch 'case-2796' into new-search

* case-2796:
  Case 2796 - Changed to new search.
Case 2796 - Modified ajax states.