add a results view, improve matching