Support for all reserved words when building collection query and fix for collection names with slashes (#404)