handle underscore for entity code in URL