diff --git a/src/main/java/net/bootsfaces/component/selectOneMenu/SelectOneMenuRenderer.java b/src/main/java/net/bootsfaces/component/selectOneMenu/SelectOneMenuRenderer.java
index 6d55746eb..8f38e1cb6 100644
--- a/src/main/java/net/bootsfaces/component/selectOneMenu/SelectOneMenuRenderer.java
+++ b/src/main/java/net/bootsfaces/component/selectOneMenu/SelectOneMenuRenderer.java
@@ -117,6 +117,8 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
 		String clientId = outerClientId+"Inner";
 		int span = startColSpanDiv(rw, menu);
 		rw.startElement("div", menu);
+		Tooltip.generateTooltip(context, menu, rw);
+		
 		if (menu.isInline()) {
 			rw.writeAttribute("class", "form-inline", "class");
 		} else {
@@ -482,15 +484,12 @@ protected void renderOption(ResponseWriter rw, UISelectItem selectItem, Object s
 		final String itemDescription = selectItem.getItemDescription();
 		final Object itemValue = selectItem.getItemValue();
 
-		boolean isItemLabelBlank = itemLabel == null || itemLabel.trim().length() == 0;
-		itemLabel = isItemLabelBlank ? " " : itemLabel;
-
 		renderOption(rw, selectedOption, index, itemLabel, itemDescription, itemValue, selectItem.isItemDisabled());
 	}
 
 	private void renderOption(ResponseWriter rw, Object selectedOption, int index, String itemLabel,
 			final String description, final Object itemValue, boolean isDisabled) throws IOException {
-		boolean isItemLabelBlank = itemLabel == null || itemLabel.trim().length() == 0;
+		boolean isItemLabelBlank = itemLabel == null || itemLabel.trim().isEmpty();
 		itemLabel = isItemLabelBlank ? " " : itemLabel;
 
 		rw.startElement("option", null);
@@ -513,8 +512,8 @@ private void renderOption(ResponseWriter rw, Object selectedOption, int index, S
 		}
 		if (isDisabled)
 			rw.writeAttribute("disabled", "disabled", "disabled");
-                
-                rw.write(itemLabel);
+
+		rw.write(itemLabel);
 
 		rw.endElement("option");
 	}
@@ -547,7 +546,7 @@ protected void renderSelectTag(ResponseWriter rw, SelectOneMenu menu) throws IOE
 	protected void renderSelectTagAttributes(ResponseWriter rw, String clientId, SelectOneMenu menu)
 			throws IOException {
 		rw.writeAttribute("id", clientId, null);
-		Tooltip.generateTooltip(FacesContext.getCurrentInstance(), menu, rw);
+		//Tooltip.generateTooltip(FacesContext.getCurrentInstance(), menu, rw);
 		rw.writeAttribute("name", clientId, null);
 
 		StringBuilder sb;