Updated/fixed queries and rmap
3 files changed