Fixed the regexp in the firm filters to handle spaces better