Index: /SPARQLBuilderWWW/web/newsparqlbuilder.js
===================================================================
--- /SPARQLBuilderWWW/web/newsparqlbuilder.js (revision 288)
+++ /SPARQLBuilderWWW/web/newsparqlbuilder.js (revision 289)
@@ -133,5 +133,9 @@
 		if(eplist.length == 0){
 			$('.SBEndPointSelect').on('epcomplete', function(){
-				$('.SBEndPointSelect').val(defendpoint);
+				$('.SBEndPointSelect option').each(function(){
+					if($(this).text() == defendpoint){
+						$(this).attr('selected', 'selected');
+					}
+				});
 				defendpoint = "";
 				loadStartClassList();
@@ -139,5 +143,9 @@
 			});
 		}else{
-			$('.SBEndPointSelect').val(defendpoint);
+			$('.SBEndPointSelect option').each(function(){
+				if($(this).text() == defendpoint){
+					$(this).attr('selected', 'selected');
+				}
+			});
 			defendpoint = "";
 			loadStartClassList();
@@ -199,4 +207,10 @@
 	$('.SBPermaLinkButton').attr('disabled', true);
 	var url = 'http://www.sparqlbuilder.org/api/eplist?ds=true';
+	$(".SBEndPointSelect").empty();
+	$(".SBEndPointSelect").attr("disabled", "disabled");
+	$(".SBStartClassSelect").empty();
+	$(".SBStartClassSelect").attr("disabled", "disabled");
+	$(".SBEndClassSelect").empty();
+	$(".SBEndClassSelect").attr("disabled", "disabled");
 	$.ajax({
 		url: url,
@@ -207,5 +221,7 @@
 			for (var i = 0; i < list.length; ++i) {
 				$(".SBEndPointSelect").append('<option value="' + list[i]['uri'] + '">' + list[i]['label'] + '</option>');
-				switchLoadIcon("hide");
+				if(defendpoint == ''){
+					switchLoadIcon("hide");
+				}
 				if($('.SBModalView').attr('display') == 'block'){
 					$(".SBEndPointSelect").select2();
@@ -214,4 +230,5 @@
 				}
 			}
+			$(".SBEndPointSelect").removeAttr("disabled");
 			$(".SBEndPointSelect").trigger(new $.Event('epcomplete'));
 		},
@@ -220,5 +237,5 @@
 
 changeEndPoint = function() {
-	endpoint = $(".SBEndPointSelect").val();
+	endpoint = $(".SBEndPointSelect option:selected").text();
 	if(endpoint != "SBDefault"){
 		loadStartClassList();
@@ -229,16 +246,20 @@
 	$('.SBPermaLinkButton').attr('disabled', true);
 	var url = "http://www.sparqlbuilder.org/api/clist?ep=" + encodeURIComponent(endpoint);
+	$(".SBStartClassSelect").empty();
+	$(".SBStartClassSelect").attr("disabled", "disabled");
+	$(".SBEndClassSelect").empty();
+	$(".SBEndClassSelect").attr("disabled", "disabled");
 	$.ajax({
 		type : "GET",
 		url : url,
-		async : false,
+		//async : false,
 		success : function(data) {
 			var list = eval(data);
 			$(".SBStartClassSelect").empty();
-			$(".SBEndClassSelect").empty();
 			$(".SBStartClassSelect").append('<option value="SBDefault">SELECT StartClass (From ' + list.length + ' classes below)</option>');
 			for (var i = 0; i < list.length; ++i) {
 				$(".SBStartClassSelect").append('<option value="' + list[i]['uri'] + '">' + list[i]['label'] + ' (' + list[i]['number'] + ')' + '</option>');
 			}
+			$(".SBStartClassSelect").removeAttr("disabled");
 			$(".SBStartClassSelect").select2();
 			$(".SBEndClassSelect").select2();
@@ -254,5 +275,5 @@
 		type : "GET",
 		url : url,
-		async : false,
+		//async : false,
 		success : function(data) {
 			var list = eval(data);
@@ -262,4 +283,5 @@
 				$(".SBEndClassSelect").append('<option value="' + list[i]['uri'] + '">' + list[i]['label'] + ' (' + list[i]['number'] + ')' + '</option>');
 			}
+			$(".SBEndClassSelect").removeAttr("disabled");
 			$(".SBStartClassSelect").select2();
 			$(".SBEndClassSelect").select2();