Add mongo-query
Fix small bug with update keys
Half-functioning POC for #860