reviewed existing mapping queries