Some fixes

This should close some issues

https://github.com/owncloud/bookmarks/issues/61
https://github.com/owncloud/bookmarks/issues/54
https://github.com/owncloud/bookmarks/issues/26