added query coverage to todo. renamed queries.