Added paging, added filter to queries to include body