Use fix_null in cluster chart