Tweaking errors controller to load correct 500 page
Merge pull request #1309 from elzj/issue_3663_errors

Tweaking errors controller to load correct 500 page
Set type for private in bookmark mapping to fix query problem
Merge pull request #1311 from elzj/bookmark_mapping

Set type for private in bookmark mapping to fix query problem