Fix room row ordering