Added BookmarkSource

Also fixed some serious ContentProvider bugs