Modified labelProperty resolving to work with primitives and plain objects