More SQL safety cleanup on special orders