Update: escape underscore