Updated to also use query string to match registered interactions.