updating matching logic to not filter out 'ua-'