CRM-15695 fix - Showing Custom data options in report criteria problem