Fix: !maps batches?