Merge instead of overwrite query with lookup. Addresses #357.
Christopher Larsen
Merge branch 'darnax1-queryfix' into develop. Closes #357.