Improved performance of /v2/badges