New code for selecting manually matched names and minor changes to established queries.