Rework tab order rest API