Added separate upload-query and entry-query options

12 jobs for improved-migrate-cli in 27 minutes and 57 seconds (queued for 9 seconds)