data_query: handle patched code with --check, fallback to unpatched supported