Fixing and improving collection aggregate get/call calls