Adding support for query only route setting

Change-Id: I3c0691381fe142cdfa59a8f0c82b451babc6ae7b