Changing es facets to accept underscores

@esoergel This is directly related to a change you made, but was causing a test failure.  Does this look appropriate?