Fix for filtering companies.
Additions to new theme.