EST-409: Reorder land register fields