Fix issue where an extra component is being added to the filter.