Update order tabs data-hooks to reflect the state
fixes #5750
speed up country creation

speed up state creation

fixes #5730