Improve routing key filtering
prod environment