query_condition: return  value data structure fix