fixing unknown listener issue and setting tenant id when adding and retreiving from registry