task query & queue counter fixes
import fix
fixes