Queries finall but non-tested