OPAL-2082: Criterion drop down 

OPAL-2087, OPAL-2070, OPAL-2071...