Fix empty query string after trailling spaces bug
Match on epigrah (as we're showing it in the results)