Aquabrowser fix
Merge pull request #194 from Coenego/aquabrowser-fix

Aquabrowser fix + tags