implement immediate query flag
Merge branch 'base-error' into ig
Merge branch 'immediate' into ig