diff --git a/plugins/customindex/views/default/customindex/content.php b/plugins/customindex/views/default/customindex/content.php
index 0aa1882c7eb746a2306c96af2cf71be9606fbbd0..27ebeb514ff2310a1210c2ad2e804ebcb43fe155 100644
--- a/plugins/customindex/views/default/customindex/content.php
+++ b/plugins/customindex/views/default/customindex/content.php
@@ -140,9 +140,9 @@
 					A few members who have put themselves on the map:
 					</p>
 					<!-- lat, lng, username, location, displayname, title, comment(text area) -->
-					<?php 
-					$users = elgg_get_entities_from_metadata('icontime', '', 'user', '', 0, 16);
-					//$users = get_entities('user', '', 0, '', 8, 0, false, 0, null);
+					<?php
+					$options = array('metadata_names'=>'icontime', 'limit'=>16);
+					$users = elgg_get_entities_from_metadata($options);
 	                
 	                if($users){
 	                    foreach($users as $user){
@@ -297,7 +297,8 @@
 	<div class="col left">
 		<h3 class="sec_main">Featured Groups</h3>
 				<?php 
-				$groups = elgg_get_entities_from_metadata("featured_group", "yes", "group", "", 0, 7, false, false, false);	
+				$options = array('metadata_names'=>'featured_group', 'metadata_values'=>'yes', 'limit'=>7);
+				$groups = elgg_get_entities_from_metadata($options);	
                 if($groups){
                     foreach($groups as $group){
                           echo "<div class=\"index_item\">";