Make map use query text, get rid of table.