Fix has observer for maps
Update lingering references to items to entries