Extra fixes for the filter variant part