Fix service handling and refresh problem for distribution table