modify to test recursive query form