modify to accommodate query string for complete