Company filter code refactored