Fixed mapping for Order column