Add sorting capabilities

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

4ef82649 Add sorting capabilities