fixed serviceid patterns and corrected comment