Switch matching logic to be exact-match instead of contains