Bug fix + added new test query Id