ST: Added prefix and suffix for tags