Monir Fixes for Group Query