Final fix to multiple comments per order