diff --git a/index_5.0.html b/index_5.0.html
index 3ed56ff..2643e93 100644
--- a/index_5.0.html
+++ b/index_5.0.html
@@ -597,7 +597,7 @@
 									<div class="btn-group d-sm-inline flex-nowrap p-0 pr-1" role="group"
 										aria-label="Bottoni Ricerca	Avanzata">
 										<button class="btn btn-sm btn-outline-success bg-light"
-											style="height: 32px; width: 78px;"
+											style="height: 32px;"
 											id="showLogic" data-toggle="collapse"
 											data-target="#collapseAdvanced" aria-expanded="true"
 											aria-controls="collapseAdvanced">
@@ -816,7 +816,7 @@
 						<select
 							class="form-control custom-select custom-select-sm catgram monMe bg-light text-muted border btn-outline-success"
 							name="commRif100" id="Commentatore100" title="Autore della fonte"
-							value="oggetto">
+							value="all">
 							<option value="all">Tutti i commentatori</option>
 						</select>
 					</div>
@@ -844,7 +844,7 @@
 						<select
 							class="form-control custom-select custom-select-sm catgram monMe bg-light text-muted border btn-outline-success"
 							name="authRif100" id="Autore_Fonte100" title="Autore della fonte"
-							value="oggetto">
+							value="all">
 							<option value="all">Tutti gli autori</option>
 						</select>
 					</div>
@@ -860,7 +860,7 @@
 						<select
 							class="form-control custom-select custom-select-sm catgram monMe bg-light text-muted border btn-outline-success"
 							name="areaRif100" id="Area_Tematica100" title="Area Tematica"
-							value="oggetto">
+							value="all">
 							<option value="all">Qualsiasi</option>
 							<option value="agiografia">Agiografia</option>
 							<option value="apologetica">Apologetica</option>
@@ -869,6 +869,18 @@
 					</div>
 				</div>
 
+				<div class="form-group px-1 pb-0 my-1">
+					<label for="testoRif100" class="text-muted control-label small pl-2 pt-2 m-0">Testo della fonte:</label>
+					<div class="form-inline input-group px-1 pt-1" action="">
+						<div class="input-group-prepend">
+							<label class="input-group-text"><ion-icon name="document-text"></ion-icon></label>
+						</div>
+						<input type="text" class="form-control form-control-sm monMe"
+							id="Testo_Fonte100" placeholder="inserisci il testo da cercare"
+							aria-describedby="name-desc" name="testoRif100">
+					</div>
+				</div>
+
 				<div class="form-group px-1 pb-0 my-1">
 					<label for="tipoRif100" class="text-muted control-label small pl-2 pt-2 m-0">Tipo
 						riferimento:</label>
@@ -879,7 +891,7 @@
 						<select
 							class="form-control custom-select custom-select-sm catgram monMe bg-light text-muted border btn-outline-success"
 							name="tipoRif100" id="Tipo_Riferimento100" title="Tipo riferimento"
-							value="oggetto">
+							value="all">
 							<option value="all">Qualsiasi</option>
 							<option value="supporto">Supporto esterno</option>
 							<option value="loci">Loci paralleli</option>
@@ -888,17 +900,14 @@
 					</div>
 				</div>
 
-				<div class="form-group px-1 pb-0 my-1">
-					<label for="tipoCitRif100" class="text-muted control-label small pl-2 pt-2 m-0">Tipo
+				<div class="form-group pl-3 pr-1 pb-0 mb-1">
+					<label for="tipoCitRif100" class="text-muted control-label small pl-2 pt-1 m-0">Tipo
 						citazione:</label>
 					<div class="form-inline input-group px-1 pt-1" action="">
-						<div class="input-group-prepend">
-							<label class="input-group-text"><ion-icon name="options"></ion-icon></label>
-						</div>
 						<select
 							class="form-control custom-select custom-select-sm catgram monMe bg-light text-muted border btn-outline-success"
 							name="tipoCitRif100" id="Tipo_Citazione100" title="Tipo citazione"
-							value="oggetto">
+							value="all" style="opacity: 0.6;" disabled>
 							<option value="all">Qualsiasi</option>
 							<option value="generica">Concordanza generica</option>
 							<option value="stringente">Concordanza stringente</option>
@@ -917,7 +926,7 @@
 						<select
 							class="form-control custom-select custom-select-sm catgram monMe bg-light text-muted border btn-outline-success"
 							name="contentRif100" id="Contenuto_Riferimento100" title="Contenuto del riferimento"
-							value="oggetto">
+							value="all">
 							<option value="all">Qualsiasi</option>
 							<option value="personaggio">Personaggio</option>
 							<option value="episodio">Episodio</option>
@@ -940,7 +949,7 @@
 						<select
 							class="form-control custom-select custom-select-sm catgram monMe bg-light text-muted border btn-outline-success"
 							name="r_t_fRif100" id="Rapporto_Testo_Fonte100" title="Rapporto testo/fonte"
-							value="oggetto">
+							value="all">
 							<option value="all">Qualsiasi</option>
 							<option value="conferma">Conferma</option>
 							<option value="contraddice">Contraddice</option>
@@ -949,18 +958,6 @@
 					</div>
 				</div>
 
-				<div class="form-group px-1 pb-0 my-1">
-					<label for="testoRif100" class="text-muted control-label small pl-2 pt-2 m-0">Testo della fonte:</label>
-					<div class="form-inline input-group px-1 pt-1" action="">
-						<div class="input-group-prepend">
-							<label class="input-group-text"><ion-icon name="document-text"></ion-icon></label>
-						</div>
-						<input type="text" class="form-control form-control-sm monMe"
-							id="Testo_Fonte100" placeholder="inserisci il testo da cercare"
-							aria-describedby="name-desc" name="testoRif100">
-					</div>
-				</div>
-
 				<div class="form-group px-1 pb-0 my-1">
 					<label for="notaRif100" class="text-muted control-label small pl-2 pt-2 m-0">Testo della nota:</label>
 					<div class="form-inline input-group px-1 pt-1" action="">
@@ -1022,10 +1019,10 @@
 
 
 		<div id="rigaNascosta" class="row" style="display: none;">
-			<!-- INIZIO MODELLI CLAUSOLE -->
+			<!-- INIZIO MODELLI -->
 
 
-			<!--   TIPO GRAMMATICALE+SINTATTICO -->
+			<!--   CLAUSOLA GRAMMATICALE+SINTATTICA -->
 			<div style="display: none;"
 				class="col-12 tab-pane px-0 bg-lida11 border-top"
 				id="clausolaN" role="tabpanel" aria-labelledby="claN-tab"
@@ -1745,7 +1742,7 @@
 				</div>
 			</div>
 
-			<!--   FINE TIPO GRAMMATICALE+SINTATTICO -->
+			<!--   FINE CLAUSOLA GRAMMATICALE+SINTATTICA -->
 
 			<!--   TIPO METAFORA -->
 
@@ -2104,7 +2101,7 @@
 
 			<div style="display: none;">
 				<ul>
-					<!--   LI CLAUSOLA -->
+					<!--   LI CLAUSOLA GRAMMATICALE+SINTATTICA -->
 					<li id="li-claxX1Xx" style="display: none;"
 						class="claLI card mx-0 my-1 py-1 px-0 list-group-item align-items-center border text-muted  bg-lida-vis">
 						<div class="handle container p-0 pl-1">
@@ -2158,9 +2155,9 @@
 								id="claBodyxX1Xx"></div>
 						</div>
 					</li>
-					<!--   FINE LI CLAUSOLA -->
+					<!--   FINE LI CLAUSOLA GRAMMATICALE+SINTATTICA -->
 
-					<!--   LI LOGICA -->
+					<!--   LI CONDIZIONE LOGICA -->
 					<li id="condxX4Xx" style="display: none;"
 						class="condLI-xX5Xx mx-0 my-1 p-1 list-group-item align-items-center text-muted bg-xX6Xx">
 						<ul id="sortablexX4Xx" class="handle list-group ui-sortable">
@@ -2189,10 +2186,10 @@
 								qui almeno 2 clausole o condizioni</li>
 						</ul>
 					</li>
-					<!--   FINE LI LOGICA -->
+					<!--   FINE LI CONDIZIONE LOGICA -->
 				</ul>
 			</div>
-			<!-- FINE MODELLI CLAUSOLE -->
+			<!-- FINE MODELLI -->
 		</div>
 
 
diff --git a/js/script_5.0.js b/js/script_5.0.js
index 6201d84..30f9582 100644
--- a/js/script_5.0.js
+++ b/js/script_5.0.js
@@ -1102,9 +1102,19 @@ $(document).ready(function() {
 		var claRifSubParList = $("#" + claRifListItemId).find("select, input");
 			claRifSubParList.each(function(){
 				var claSubParType = $(this)[0].type;
-				if (claSubParType == "select-one" && $(this)[0].selectedIndex != 0) {
+				if (claSubParType == "select-one") {
 					claText = claText + "; " + $(this)[0].options[$(this)[0].selectedIndex].text;
        	  			jsonTextToParse = jsonTextToParse + ', "' + $(this)[0].id.replace(claRifIdNum,"") + '": "' + $(this)[0].options[$(this)[0].selectedIndex].value + '"';
+       	  			if ($(this)[0].id.startsWith("Tipo_Riferimento")) {
+						if ($(this)[0][3].selected) {
+							$('#Tipo_Citazione'+claRifIdNum)[0].removeAttribute("style");
+							$('#Tipo_Citazione'+claRifIdNum).prop('disabled', false);							
+						} else {
+							$('#Tipo_Citazione'+claRifIdNum)[0].selectedIndex = 0;
+							$('#Tipo_Citazione'+claRifIdNum)[0].setAttribute("style", "opacity: 0.6;");
+							$('#Tipo_Citazione'+claRifIdNum).prop('disabled', true);
+						}
+					};
 				};
 				if (claSubParType == "text" && $(this)[0].value) {
 					claText = claText + "; " + $(this)[0].value;