ref #8011 Remove unused parameters
ref #8011 Set termType in search controller constructor
ref #8011 Refactored package structure