Adding code to limit bucket fetches when joining