Fixed query
fixed issue in cu-tk and mds