Waffle search-api-es a bit betterer (bug 851588)