ElasticSearch backend fixes + updates

Test Plan: -

Reviewers: marcua, jblum

Reviewed By: jblum

Differential Revision: https://phabricator.locu.com/D7272