fix query return set