Fix problem with masked ampersands and bs4

[FlorianWilhelm]

• Fix a problem with masked ampersands leading to ' instead of '
• Fix problem with PY3, i.e. calling decode on str object

[danielfrg]

Thanks!