Add a proper grouping statement policy