more defensive schema, avoid NULLs
 accuracy for warning message queries