Add public fall back to ESQuery