Handle a couple of more ES corner cases
Merge pull request #61 from infoxchange/more-es-fixes

Handle a couple of more ES corner cases