Bug fix. Now Tags are added properly.