label fix for itemcount 0 + cleanup