Fix compare int-str bug Fix empty values error Replace sort by attribute filter with direct order_by additional make targets