Remove data criteria highlight radio buttons, only highlight for admin user
Merge branch 'remove_data_criteria_highlight', fixes #286