More fixes for access group filtering