bug fixes for drive and shapefile upload, removing query package