Update code to match based on user name, include both KVR group listings with logic to guess the right one