Catalyst-web: Improve composite search experience

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

b19eaa4f Catalyst-web: Improve composite search experience