(SP-28) Added selection options ordering to search forms