Fix group name scoping by location filter