Changes to router with queris