draft framework for additional coverage of unsupported and unparsed queries