Fixed filter variants UI
Merge pull request #1 from sebastienblanc/compose-fix

Extra fixes for the filter variant part