Fix metrics webservice behaviour