Clean chunking implementation
Explicitly add format and scope to links generated from map #1344