Added counting to GenericSearch

In addition license's manufacturer is made optional.