Fix Dynamic Hints Variable Substition - Underscore Problem