added account and group query types