Fixed security issue related to escaping user input