Rework of filtering the options on the order page.