Patch for dbstep_query.h and dbstep_query.cpp