Maint/burgundy/rename count query param again