Use empty flow where appropriate
Fix cassandra router hierarchy