update correct observable handling