Add quoting
Add bookmark relative paths