better handling of the describe with no query