Ensure "filter" is used rather than "match" where precise search required

Identify any situations in ui-agreements or ui-licenses where a "match" search is used where a "filter" would be better used. Specifically where an exact search is being made (e.g. on UUID) this should use a filter rather than a match search (although the outcome should be the same if UUID is used as the match/filter term)