Add minus and underscore in Url handler.