Updated some queries