Update to real select and input names