fixing observable maps and lists