Added count and join methods to combined PublicQuery, added some tests