Fix items with spaces