Fixed issue with trailing underscore not being handled properly which was causing some situations on beta to not display properly.