Case 3019 - Sorted entity buttons.
Merge branch 'case-3019' into new-search

* case-3019:
  Case 3019 - Sorted entity buttons.