Case 2795 - Modifications related to new search.