Added basic tag support; bugfix