Fixes tax bugs on back office form when in conjunction with 5.36.0