(1) Bug fix for collection ids with Express, (2) updates to dynamic queryToRestMap.
Improve Express support.