* made the content observer firing more robust
* refactored URIs to indicate a relationship between them