Fix ordering messages - put orderBy last