diff --git a/mongodb_migrate/mongodb_migrate.drush.inc b/mongodb_migrate/mongodb_migrate.drush.inc
index 0b26279..21a866c 100644
--- a/mongodb_migrate/mongodb_migrate.drush.inc
+++ b/mongodb_migrate/mongodb_migrate.drush.inc
@@ -77,10 +77,20 @@ function drush_mongodb_migrate() {
       $query = db_select($entity_info['base table'], 'e')
         ->fields('e', array($id_field))
         ->condition($id_field, $max, '>')
-        ->orderBy($id_field, ASC)
+        ->orderBy($id_field, 'ASC')
         ->range(0, 1);
       if (isset($entity_info['entity keys']['bundle'])) {
-        $query->condition($entity_info['entity keys']['bundle'], $bundles);
+        if ($entity_type == 'comment') {
+          $query->join('node', 'n', 'n.nid = e.nid');
+          $query->condition('CONCAT("comment_node_", n.type)', $bundles);
+        }
+        else if ($entity_type == 'taxonomy_term') {
+          $query->join('taxonomy_vocabulary', 'tv', 'tv.vid = e.vid');
+          $query->condition('tv.machine_name', $bundles);
+        }
+        else {
+          $query->condition($entity_info['entity keys']['bundle'], $bundles);
+        }
       }
       $entity_id = $query->execute()->fetchField();
       if ($entity_id) {