Cleanup: First pass reorganization of mongo curious to break apart
separate queries for separate tables.