diff --git a/ios/RetroArch/RAModuleInfoList.m b/ios/RetroArch/RAModuleInfoList.m
index af3d0764d7..3ad1ba2c89 100644
--- a/ios/RetroArch/RAModuleInfoList.m
+++ b/ios/RetroArch/RAModuleInfoList.m
@@ -23,21 +23,13 @@
    new.configPath = [NSString stringWithFormat:@"%@/%@.cfg", [RetroArch_iOS get].system_directory, [[thePath lastPathComponent] stringByDeletingPathExtension]];
    new.data = theData;
    
-   new.recommendedExtensions = [[theData getStringNamed:@"recommended_extensions" withDefault:@""] componentsSeparatedByString:@"|"];
-   new.suggestedExtensions = [[theData getStringNamed:@"suggested_extensions" withDefault:@""] componentsSeparatedByString:@"|"];
+   new.supportedExtensions = [[theData getStringNamed:@"supported_extensions" withDefault:@""] componentsSeparatedByString:@"|"];
    return new;
 }
 
-- (unsigned)supportLevelOfPath:(NSString*)thePath
+- (bool)supportsFileAtPath:(NSString*)path
 {
-   NSString* ext = [thePath pathExtension];
-   
-   if ([self.recommendedExtensions containsObject:ext])
-      return 0;
-   else if([self.suggestedExtensions containsObject:ext])
-      return 1;
-   
-   return 2;
+   return [self.supportedExtensions containsObject:[[path pathExtension] lowercaseString]];
 }
 
 @end
diff --git a/ios/RetroArch/browser/RAModuleList.m b/ios/RetroArch/browser/RAModuleList.m
index 3af24127e6..0430803900 100644
--- a/ios/RetroArch/browser/RAModuleList.m
+++ b/ios/RetroArch/browser/RAModuleList.m
@@ -17,10 +17,8 @@
 
 @implementation RAModuleList
 {
-   NSMutableArray* _modules[3];
-
-   unsigned _sectionCount;
-   unsigned _sectionMap[3];
+   NSMutableArray* _supported;
+   NSMutableArray* _other;
 
    NSString* _game;
 }
@@ -47,9 +45,8 @@
    }
    
    // Load the modules with their data
-   _modules[0] = [NSMutableArray array];
-   _modules[1] = [NSMutableArray array];
-   _modules[2] = [NSMutableArray array];
+   _supported = [NSMutableArray array];
+   _other = [NSMutableArray array];
    
    for (int i = 0; i != [moduleList count]; i ++)
    {
@@ -57,51 +54,49 @@
       NSString* baseName = [[modulePath stringByDeletingPathExtension] stringByAppendingPathExtension:@"info"];
 
       RAModuleInfo* module = [RAModuleInfo moduleWithPath:modulePath data:[[RAConfig alloc] initWithPath:baseName]];
-      [_modules[[module supportLevelOfPath:_game]] addObject:module];
+      
+      if ([module supportsFileAtPath:_game])
+         [_supported addObject:module];
+      else
+         [_other addObject:module];
    }
-   
-   for (int i = 0; i != 3; i ++)
-      if ([_modules[i] count])
-      {
-         _sectionMap[_sectionCount] = i;
-         _sectionCount ++;
-      }
-   
+  
    [self setTitle:[_game lastPathComponent]];
    return self;
 }
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView*)tableView
 {
-   return _sectionCount;
+   return _supported.count ? 2 : 1;
 }
 
 - (NSString*)tableView:(UITableView*)tableView titleForHeaderInSection:(NSInteger)section
 {
-   switch (_sectionMap[section])
-   {
-      case 0: return @"Recommended Emulators";
-      case 1: return @"Suggested Emulators";
-      default: return @"Other Emulators";
-   }
+   if (_supported.count)
+      return (section == 0) ? @"Suggested Emulators" : @"Other Emulators";
+
+   return @"All Emulators";
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-   return _modules[section] ? [_modules[_sectionMap[section]] count] : 0;
+   NSMutableArray* sectionData = (_supported.count && section == 0) ? _supported : _other;
+   return sectionData.count;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-   unsigned section = _sectionMap[indexPath.section];
-   [RetroArch_iOS get].moduleInfo = (RAModuleInfo*)[_modules[section] objectAtIndex:indexPath.row];;
+   NSMutableArray* sectionData = (_supported.count && indexPath.section == 0) ? _supported : _other;
+   [RetroArch_iOS get].moduleInfo = (RAModuleInfo*)sectionData[indexPath.row];
+
    [[RetroArch_iOS get] runGame:_game];
 }
 
 - (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath
 {
-   unsigned section = _sectionMap[indexPath.section];
-   [RetroArch_iOS get].moduleInfo = (RAModuleInfo*)[_modules[section] objectAtIndex:indexPath.row];
+   NSMutableArray* sectionData = (_supported.count && indexPath.section == 0) ? _supported : _other;
+   [RetroArch_iOS get].moduleInfo = (RAModuleInfo*)sectionData[indexPath.row];
+
    [[RetroArch_iOS get] showSettings];
 }
 
@@ -110,8 +105,9 @@
    UITableViewCell* cell = [self.tableView dequeueReusableCellWithIdentifier:@"module"];
    cell = (cell != nil) ? cell : [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"module"];
 
-   unsigned section = _sectionMap[indexPath.section];   
-   RAModuleInfo* info = (RAModuleInfo*)[_modules[section] objectAtIndex:indexPath.row];
+   NSMutableArray* sectionData = (_supported.count && indexPath.section == 0) ? _supported : _other;
+   RAModuleInfo* info = (RAModuleInfo*)sectionData[indexPath.row];
+
    cell.textLabel.text = info.displayName;
    cell.accessoryType = (info.data) ? UITableViewCellAccessoryDetailDisclosureButton : UITableViewCellAccessoryNone;
 
diff --git a/ios/RetroArch/views.h b/ios/RetroArch/views.h
index 71174e8e75..06efbe1fed 100644
--- a/ios/RetroArch/views.h
+++ b/ios/RetroArch/views.h
@@ -26,11 +26,10 @@
 @property (strong) NSString* path;
 @property (strong) NSString* configPath;
 @property (strong) RAConfig* data;
-@property (strong) NSArray* recommendedExtensions;
-@property (strong) NSArray* suggestedExtensions;
+@property (strong) NSArray* supportedExtensions;
 
 + (RAModuleInfo*)moduleWithPath:(NSString*)thePath data:(RAConfig*)theData;
-- (unsigned)supportLevelOfPath:(NSString*)thePath;
+- (bool)supportsFileAtPath:(NSString*)path;
 @end
 
 @interface RAModuleInfoList : UITableViewController