WIP: Add orderBy filter to messages