Improve basic search in web-catalyst

Change-Id: Ie865bdb8924223aca06e2f5a1125d0b28443afd7
Merge topic 'catalyst-web-composite' into master

6d42e913 Improve basic search in web-catalyst