Fix typo causing es-default-base not to be prepended
Formatting clean up