fix service matcher