Adding better option override process, begin rewrite of options list.
Fixing refs to choices list.
Cleanup opp queryform structure.