Enhance routes GET query for S1912