company types and refactoring
types and filter on map