diff --git a/radar.inc.php b/radar.inc.php
index 6a5ec1277915351eb54bf408853b3f930379f4e9..a59923a745e60325f2e8c401e89d5a0919ff99c7 100644
--- a/radar.inc.php
+++ b/radar.inc.php
@@ -72,8 +72,10 @@ function radar_filter($settings) {
  * Collapses subfields, simplifies field list.
  */
 function _radar_field_collect_subfields(&$fields) {
+  $entity_fields = array();
+
   foreach ($fields as $delta => $listed_field) {
-    list($field, $subfield) = explode(':', $listed_field, 2);
+    list($field, $subfield) = array_pad(explode(':', $listed_field, 2), 2, null);
     if (!empty($subfield)) {
       // A field with subfields.
       if (!empty($entity_fields[$field])) {
diff --git a/radar.php b/radar.php
index 79493cc16487fefe7e578c5305c1b0c36d4602c6..e9df2f7a855962fc021be705fb30252c74e1ac76 100644
--- a/radar.php
+++ b/radar.php
@@ -326,6 +326,8 @@ add_filter('shortcode_atts_radar_events', 'radar_shortcode_parse', 10, 3);
  * Format item's parsed fields array for radar shortcode's.
  */
 function radar_format_item($type, $item, $shortcode, $parents = array()) {
+  $content = '';
+
   foreach ($item as $field) {
     // Item containing other items.
     if (!empty($field['entity'])) {