fixing facet related scales
Merge branch 'facet-issue'