ESO bugfixes

There are a few major bugs in ESO that submit the wrong form content.  This fixes some of them.