APd-232: Added search query param in the text box wherever applicable
Merge branch 'APD-232' into develop