Changes to swe:ObservableProperty/* handling and remove extraneous $ chars from some titles