More work on routing key matching