Fix double-escaping of resource properties