fixes to objectstoremodel