added partial and exact match support