Fixing a bug and sorting out the batch-image query.