Criteria refactoring done. Updated mybadges renderer