Fixed routing issues with _'s