ref #8011 Enhance sort on search results
ref #8011 Sort search results
ref #8011 Refactored package structure