--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/SBSv2PlatformFilterComposite.java	Mon Jul 26 17:32:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/SBSv2PlatformFilterComposite.java	Tue Jul 27 10:31:29 2010 -0500
@@ -120,11 +120,19 @@
 			public void widgetSelected(SelectionEvent e) {
 				refreshButton.setEnabled(false);
 				refreshButton.setText(Messages.getString("SBSv2PlatformFilterComposite.RefreshButtonScanningText")); //$NON-NLS-1$
-				initTable(true);
+				SBSv2QueryUtils.removeAllCachedQueries();
+				clearLocalSBSCacheData();
+				initTable();
 				refreshButton.setText(Messages.getString("SBSv2PlatformFilterComposite.RefreshButtonText")); //$NON-NLS-1$
 				refreshButton.setEnabled(true);
 			}
 			
+			private void clearLocalSBSCacheData(){
+				aliasMap.clear();
+				productVariantList.clear();
+			}
+			
+			
 		});
 		
 		Composite variantButtonsComposite = new Composite(this, SWT.NONE);
@@ -200,7 +208,7 @@
 			
 		});
 		
-		initTable(false);
+		initTable();
 	}
 
 	public void performOk() {
@@ -219,28 +227,28 @@
 		SBSv2Utils.setSBSv2FilteredConfigs(checkedConfigs.toArray(new String[checkedConfigs.size()]));
 	}
 	
-	private void initTable(boolean forceRescan) {
+	private void initTable() {
 
 		SBSv2Utils.initDefaultConfigsToFilter();
 		
-		if (aliasMap.size() == 0 || forceRescan){
+		if (aliasMap.size() == 0){
 			try {
-				aliasMap = SBSv2QueryUtils.getCompleteAliasList(forceRescan);
+				aliasMap = SBSv2QueryUtils.getCompleteAliasList();
 			} catch (SBSv2MinimumVersionException e) {
 				// Force a scan for version in case system was updated
 				SDKCorePlugin.getSDKManager().getSBSv2Version(true);
 				try {
 					// try, try again...
-					aliasMap = SBSv2QueryUtils.getCompleteAliasList(forceRescan);
+					aliasMap = SBSv2QueryUtils.getCompleteAliasList();
 				} catch (SBSv2MinimumVersionException e2) {
 					MessageDialog.openError(getShell(), "Minimum sbs version not met.", e.getMessage());
 				}
 			} 
 		}
 		
-		if (productVariantList.size() == 0 || forceRescan){
+		if (productVariantList.size() == 0){
 			try {
-				productVariantList = SBSv2QueryUtils.getCompleteProductVariantList(forceRescan);
+				productVariantList = SBSv2QueryUtils.getCompleteProductVariantList();
 			} catch (SBSv2MinimumVersionException e) {
 				
 			}
@@ -278,7 +286,7 @@
 	}
 	
 	public void setDefaults(){
-		initTable(false);
+		initTable();
 		for (TableItem item : buildAliasTableViewer.getTable().getItems()) {
 			if (item.getText().toLowerCase().equals("armv5_udeb")  || 
 				item.getText().toLowerCase().equals("armv5_urel") ||