bugfixing id escaping