added more queries. not all tested