Changed to use key_id, now only exact match