Added Escaping of % symbols