Generic-Search refactored to angular.