Changed order of options to reflect filtering