A few changes including filtering folders and adding domain to Bookmark model