Fix mention to specific service on generic message