Add escaping throughout where missing