diff --git a/src/main/java/org/olat/core/gui/components/table/TableRenderer.java b/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
index 467014d24b1ed924dd8e8b366d76c9ec92d46835..b816a52ba473fb05fb94bd7358a437ea5595e7a5 100644
--- a/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
@@ -208,15 +208,14 @@ public class TableRenderer extends DefaultComponentRenderer {
 			boolean ajaxEnabled, URLBuilder ubu) {
 		if (table.isMultiSelect() && !table.isMultiSelectAsDisabled()) {
 			target.append("<div class='o_table_checkall input-sm'>")
-			  .append("<label class='checkbox-inline'>")
 			  .append("<a href='#' onclick=\"javascript:o_table_toggleCheck('").append(formName).append("', true)\">")
 			  .append("<i class='o_icon o_icon-lg o_icon_check_on'> </i> ")
 			  .append(translator.translate("checkall"))
-			  .append("</a></label>");
-			target.append("<label class='checkbox-inline'><a href=\"#\" onclick=\"javascript:o_table_toggleCheck('").append(formName).append("', false)\">")
+			  .append("</a>");
+			target.append("<a href=\"#\" onclick=\"javascript:o_table_toggleCheck('").append(formName).append("', false)\">")
 			  .append("<i class='o_icon o_icon-lg o_icon_check_off'> </i> ")
 			  .append(translator.translate("uncheckall"))
-			  .append("</a></label>")
+			  .append("</a>")
 			  .append("</div>");
 		}
 
diff --git a/src/test/java/org/olat/selenium/page/taxonomy/TaxonomyTreePage.java b/src/test/java/org/olat/selenium/page/taxonomy/TaxonomyTreePage.java
index c080def36f917c7bc59cd81eb8f2e16d0f425dcf..820b73159cc565ba173b64bb38b5e66bd6450c5f 100644
--- a/src/test/java/org/olat/selenium/page/taxonomy/TaxonomyTreePage.java
+++ b/src/test/java/org/olat/selenium/page/taxonomy/TaxonomyTreePage.java
@@ -69,7 +69,7 @@ public class TaxonomyTreePage {
 	}
 	
 	public TaxonomyLevelPage selectTaxonomyLevel(String identifier) {
-		By selectBy = By.xpath("//div[contains(@class,'o_sel_taxonomy_levels_tree')]//table//tr[td[text()[contains(.,'" + identifier + "')]]]/td/a[contains(@href,'select')]");
+		By selectBy = By.xpath("//div[contains(@class,'o_sel_taxonomy_levels_tree')]//table//tr/td/a[contains(@href,'select')][text()[contains(.,'" + identifier + "')]]");
 		OOGraphene.waitElement(selectBy, browser);
 		browser.findElement(selectBy).click();
 		OOGraphene.waitBusy(browser);