diff --git a/migration_helpers.module b/migration_helpers.module
index 9a6f597..c99ed2b 100644
--- a/migration_helpers.module
+++ b/migration_helpers.module
@@ -3,18 +3,25 @@
 /**
  * Entity query helper.
  */
-function migration_helpers_entity_query($entity_type, $bundle, $field = '') {
+function migration_helpers_entity_query(
+  $entity_type = 'node',
+  $bundle = NULL,
+  $field = NULL,
+) {
 
   /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */
   $entity_type_manager = \Drupal::service('entity_type.manager');
 
   $entity_storage = $entity_type_manager->getStorage($entity_type);
-  $bundle_key = $entity_storage->getEntityType()->getKey('bundle');
 
   $entity_query = $entity_storage->getQuery();
-  $entity_query->condition($bundle_key, $bundle);
 
-  if (!empty($field)) {
+  if ($bundle) {
+    $bundle_key = $entity_storage->getEntityType()->getKey('bundle');
+    $entity_query->condition($bundle_key, $bundle);
+  }
+
+  if ($field) {
     // Check that field BOTH is present on entity bundle AND has a value saved.
     $entity_query->exists($field);
   }