Amended and added test cases for compound queries QAdv2A