Support prefix queries, add name to match results.