- In progress: refactor: rename itemsGrouping to bucket (collections done, templates pending)