More work on matching routing keys