Fix _ substitution causing bad service retrieval