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