modify handlers to accept query string