Fixed escaping in data access