Fix to make discovery use new services format - UNTESTED

Seems logically correct but not able to test at the moment