Added tags and escaping of brackets