case 2207 - Keep search phrase in the search input.
Merge branch 'case-2207' into develop