fixed DOLDB2 queries