data_query: handle patched code with --check, fallback to unpatched supported
give helpful pointers if get id failed
Merge branch 'lrwp' into lrwp2
Merge pull request #9 from glensc/lrwp2

Lrwp2