Removed potentially superfluous escaping of ids