facet grammar fixes
improved formatter