AJ-1573 more logic for managing metric badges