optimize grid, push single selector to their following nesting group