[Security][Acl] Reduce query size when select ACL type is same

Rebased & squashed version of #6479.

ps. I was thinking that this could be done on _lower_ versions too, but was not sure =)