More documentation.
Fix bug where auto_map_queries wouldn't be respected when it changes.