Fix order form errors

* Update order form to pass the correct values for select field options