queries updated, file grabber separated