Fix issue with multi select on themes