Fix for supporting bookmark names that contain spaces

Created originally on Bitbucket by vosc (Volker Schumacher)

Was already merged in Bitbucket before import, marked as merged by the import user

Hi, title says it all, feel free to merge this if you find it useful ... Cheers, Volker