update so that the queries are join table queries instead of pulling two queries for messages and comments