fix double attributes and removed 'vendor:' and 'model:'
gaurd against treating None like an iterable