Newsletter model refactor and improved queries.