Reorder template so dicts are picked up correctly