Use Sunspot API instead of custom MatchService