diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
index 5dbda600db..c8e26abe7e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
@@ -386,6 +386,10 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 		*/
 		
 		int id = -3;
+		
+		if (m_tableName == null)	//	sets table name & key column
+			getDirectAccessSQL("*");
+		
 		final InfoPanel ip = InfoManager.create(lookup, gridField, m_tableName, m_keyColumnName, getComponent().getText(), false, getWhereClause());
 		if (ip != null && ip.loadedOK() && ip.getRowCount() == 1)
 		{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
new file mode 100644
index 0000000000..6c5a359c7e
--- /dev/null
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
@@ -0,0 +1,486 @@
+/**
+ * 
+ */
+package org.adempiere.webui.info;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.adempiere.webui.AdempiereWebUI;
+import org.adempiere.webui.component.Grid;
+import org.adempiere.webui.component.GridFactory;
+import org.adempiere.webui.component.Label;
+import org.adempiere.webui.component.Row;
+import org.adempiere.webui.component.Rows;
+import org.adempiere.webui.editor.WEditor;
+import org.adempiere.webui.editor.WebEditorFactory;
+import org.adempiere.webui.event.ValueChangeEvent;
+import org.adempiere.webui.event.ValueChangeListener;
+import org.adempiere.webui.panel.InfoPanel;
+import org.compiere.minigrid.ColumnInfo;
+import org.compiere.minigrid.IDColumn;
+import org.compiere.model.AccessSqlParser;
+import org.compiere.model.AccessSqlParser.TableInfo;
+import org.compiere.model.GridField;
+import org.compiere.model.GridFieldVO;
+import org.compiere.model.MColumn;
+import org.compiere.model.MInfoColumn;
+import org.compiere.model.MInfoWindow;
+import org.compiere.model.MLookupFactory;
+import org.compiere.model.MLookupInfo;
+import org.compiere.model.MTable;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.ValueNamePair;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zul.Borderlayout;
+import org.zkoss.zul.Center;
+import org.zkoss.zul.Checkbox;
+import org.zkoss.zul.Div;
+import org.zkoss.zul.North;
+import org.zkoss.zul.Separator;
+import org.zkoss.zul.South;
+import org.zkoss.zul.Space;
+import org.zkoss.zul.Vbox;
+
+/**
+ * AD_InfoWindow implementation
+ * @author hengsin
+ *
+ */
+public class InfoWindow extends InfoPanel implements ValueChangeListener {
+
+	/**
+	 * generated serial id
+	 */
+	private static final long serialVersionUID = -6235804178650786285L;
+	protected Grid parameterGrid;
+	private Borderlayout layout;
+	private Vbox southBody;
+	/** List of WEditors            */
+    private List<WEditor> editors = null;
+    private Properties infoContext = new Properties(Env.getCtx());
+
+	/** Max Length of Fields */
+    public static final int FIELDLENGTH = 20;
+    
+    protected ColumnInfo[] columnInfos = new ColumnInfo[0];
+	protected MInfoWindow infoWindow;
+	protected TableInfo[] tableInfos;
+	protected MInfoColumn[] infoColumns;	
+	protected String queryValue;
+	
+	private List<GridField> gridFields = null;
+    
+	/**
+	 * @param WindowNo
+	 * @param tableName
+	 * @param keyColumn
+	 * @param multipleSelection
+	 * @param whereClause
+	 */
+	public InfoWindow(int WindowNo, String tableName, String keyColumn, String queryValue, 
+			boolean multipleSelection, String whereClause) {
+		this(WindowNo, tableName, keyColumn, queryValue, multipleSelection, whereClause, true);
+	}
+
+	/**
+	 * @param WindowNo
+	 * @param tableName
+	 * @param keyColumn
+	 * @param multipleSelection
+	 * @param whereClause
+	 * @param lookup
+	 */
+	public InfoWindow(int WindowNo, String tableName, String keyColumn, String queryValue, 
+			boolean multipleSelection, String whereClause, boolean lookup) {
+		super(WindowNo, tableName, keyColumn, multipleSelection, whereClause,
+				lookup);
+		this.queryValue = queryValue;
+		p_loadedOK = loadInfoDefinition(); 
+		if (loadedOK()) {
+			initUI();
+			
+			if (queryValue != null && queryValue.trim().length() > 0)
+			{
+				processQueryValue();
+			}
+		}
+	}
+
+	private void processQueryValue() {
+		//try first 2 only
+		for(int i = 0; i < editors.size() && i < 2; i++) {
+			WEditor editor = editors.get(i);
+			editor.setValue(queryValue);
+			testCount();
+			if (m_count > 0) {
+				break;
+			} else {
+				editor.setValue(null);
+			}
+		}
+		
+		if (m_count > 0) {
+			executeQuery();
+			renderItems();
+		} else if (editors.size() > 0) {
+			editors.get(0).setValue(queryValue);
+		}
+	}
+
+	private boolean loadInfoDefinition() {
+		if (p_tableName.startsWith("AD_InfoWindow_ID=")) {
+			int AD_InfoWindow_ID = Integer.parseInt(p_tableName.substring("AD_InfoWindow_ID=".length()));
+			infoWindow = new MInfoWindow(Env.getCtx(), AD_InfoWindow_ID, null);
+			p_tableName = MTable.getTableName(Env.getCtx(), infoWindow.getAD_Table_ID());
+		} else {
+			infoWindow = MInfoWindow.get(p_tableName, (String)null);			
+		}
+		
+		if (infoWindow != null) {
+			AccessSqlParser sqlParser = new AccessSqlParser("SELECT * FROM " + infoWindow.getFromClause());
+			tableInfos = sqlParser.getTableInfo(0);
+			
+			infoColumns = infoWindow.getInfoColumns(tableInfos);
+			
+			prepareTable();
+			
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	private void prepareTable() {		
+		List<ColumnInfo> list = new ArrayList<ColumnInfo>();
+		String keyTableAlias = tableInfos[0].getSynonym() != null && tableInfos[0].getSynonym().trim().length() > 0 
+				? tableInfos[0].getSynonym()
+				: tableInfos[0].getTableName();
+					
+		String keySelectClause = keyTableAlias+"."+p_keyColumn;
+		list.add(new ColumnInfo(" ", keySelectClause, IDColumn.class));
+		
+		gridFields = new ArrayList<GridField>();
+		for(MInfoColumn infoColumn : infoColumns) 
+		{						
+			String columnName = infoColumn.getAD_Element().getColumnName();
+			GridFieldVO vo = GridFieldVO.createParameter(infoContext, p_WindowNo, 0, 
+					columnName, infoColumn.get_Translation("Name"), infoColumn.getAD_Reference_ID(), 
+					0, false, false);
+			GridField gridField = new GridField(vo);
+			gridFields.add(gridField);
+			//TODO: check display logic using info context
+			if (infoColumn.isDisplayed()) 
+			{
+				ColumnInfo columnInfo = null;
+				if (infoColumn.getAD_Reference_ID() == DisplayType.ID) 
+				{
+					if (infoColumn.getSelectClause().equalsIgnoreCase(keySelectClause))
+						continue;
+					
+					columnInfo = new ColumnInfo(infoColumn.getName(), infoColumn.getSelectClause(), DisplayType.getClass(infoColumn.getAD_Reference_ID(), true));
+				}
+				else if (DisplayType.isLookup(infoColumn.getAD_Reference_ID()))
+				{
+					if (infoColumn.getAD_Reference_ID() == DisplayType.List)
+					{
+						columnInfo = new ColumnInfo(infoColumn.getName(), infoColumn.getSelectClause(), ValueNamePair.class, (String)null);
+					}
+					else
+					{
+						columnInfo = createLookupColumnInfo(tableInfos, gridField, infoColumn);
+					}					
+				}
+				else  
+				{
+					columnInfo = new ColumnInfo(infoColumn.getName(), infoColumn.getSelectClause(), DisplayType.getClass(infoColumn.getAD_Reference_ID(), true));
+				}
+				columnInfo.setGridField(gridField);
+				list.add(columnInfo);				
+			}			
+		}
+		
+		columnInfos = list.toArray(columnInfos);
+		
+		prepareTable(columnInfos, infoWindow.getFromClause(), p_whereClause, infoWindow.getOtherClause());
+	}
+
+	private ColumnInfo createLookupColumnInfo(TableInfo[] tableInfos,
+			GridField gridField, MInfoColumn infoColumn) {
+		String columnName = gridField.getColumnName();
+		int AD_Reference_Value_ID = 0;
+		String validationCode = "";
+		MLookupInfo lookupInfo = MLookupFactory.getLookupInfo(Env.getCtx(), p_WindowNo, 0, infoColumn.getAD_Reference_ID(), null, columnName, AD_Reference_Value_ID, false, validationCode);
+		String displayColumn = lookupInfo.DisplayColumn;
+		
+		int index = infoColumn.getSelectClause().indexOf(".");
+		if (index == infoColumn.getSelectClause().lastIndexOf("."))
+		{
+			String synonym = infoColumn.getSelectClause().substring(0, index);
+			for(TableInfo tableInfo : tableInfos)
+			{
+				if (tableInfo.getSynonym() != null && tableInfo.getSynonym().equals(synonym)) 
+				{
+					if (tableInfo.getTableName().equalsIgnoreCase(lookupInfo.TableName))
+					{
+						displayColumn = displayColumn.replace(lookupInfo.TableName+".", tableInfo.getSynonym()+".");
+						ColumnInfo columnInfo = new ColumnInfo(infoColumn.getName(), displayColumn, KeyNamePair.class, infoColumn.getSelectClause());
+						return columnInfo;
+					}
+					break;
+				}
+			}
+		}
+		
+		WEditor editor = null;
+        editor = WebEditorFactory.getEditor(gridField, true);
+        editor.setMandatory(false);
+        editor.setReadWrite(false);
+        editorMap.put(infoColumn.getSelectClause(), editor);
+        
+		ColumnInfo columnInfo = new ColumnInfo(infoColumn.getName(), infoColumn.getSelectClause(), KeyNamePair.class, (String)null);
+		return columnInfo;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.adempiere.webui.panel.InfoPanel#getSQLWhere()
+	 */
+	@Override
+	protected String getSQLWhere() {
+		StringBuilder builder = new StringBuilder();
+		for(WEditor editor : editors) {
+			if (editor.getValue() != null) {
+				if (builder.length() > 0) {
+					builder.append(" AND ");
+				}
+				builder.append(editor.getColumnName()).append("=?");
+			}
+		}
+		return builder.toString();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.adempiere.webui.panel.InfoPanel#setParameters(java.sql.PreparedStatement, boolean)
+	 */
+	@Override
+	protected void setParameters(PreparedStatement pstmt, boolean forCount)
+			throws SQLException {
+		int parameterIndex = 0;
+		for(WEditor editor : editors) {
+			Object value = editor.getValue();
+			if (value != null) {
+				parameterIndex++;
+				if (value instanceof Boolean) {					
+					pstmt.setString(parameterIndex, ((Boolean) value).booleanValue() ? "Y" : "N");
+				} else if (value instanceof String) {
+					if (isSearchLike(editor.getGridField())) {
+						StringBuilder valueStr = new StringBuilder(value.toString().toUpperCase());
+	                    if (!valueStr.toString().endsWith("%"))
+	                        valueStr.append("%");
+	                    pstmt.setString(parameterIndex, valueStr.toString());
+					} else {
+						pstmt.setString(parameterIndex, (String)value);
+					}
+				} else {
+					pstmt.setObject(parameterIndex, value);
+				}
+				
+			}
+		}
+
+	}
+
+	protected void initUI()
+	{
+		initParameterPanel();
+		
+		layout = new Borderlayout();
+        layout.setWidth("100%");
+        layout.setHeight("100%");
+        if (!isLookup())
+        {
+        	layout.setStyle("position: absolute");
+        }
+        this.appendChild(layout);
+
+        North north = new North();
+        layout.appendChild(north);
+		north.appendChild(parameterGrid);
+
+        Center center = new Center();
+		layout.appendChild(center);
+		Div div = new Div();
+		div.appendChild(contentPanel);
+		if (isLookup())
+			contentPanel.setWidth("99%");
+        else
+        	contentPanel.setStyle("width: 99%; margin: 0px auto;");
+        contentPanel.setVflex(true);
+		div.setStyle("width :100%; height: 100%");
+		center.appendChild(div);
+		div.setVflex("1");
+		div.setHflex("1");
+
+		South south = new South();
+		layout.appendChild(south);
+		southBody = new Vbox();
+		southBody.setHflex("1");
+		south.appendChild(southBody);
+		southBody.appendChild(new Separator());
+		southBody.appendChild(confirmPanel);
+		southBody.appendChild(statusBar);
+		
+		if (isLookup()) {
+			Env.clearTabContext(Env.getCtx(), p_WindowNo, Env.TAB_INFO);
+		}
+        		
+	}
+
+	protected void initParameterPanel() {
+		parameterGrid = GridFactory.newGridLayout();
+		parameterGrid.setWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME, "infoParameterPanel");
+		
+		Rows rows = new Rows();
+		parameterGrid.appendChild(rows);
+		
+		editors = new ArrayList<WEditor>();
+		for (int i = 0; i < infoColumns.length; i++)
+		{
+			if (infoColumns[i].isQueryCriteria())
+				addSelectionColumn(gridFields.get(i));
+		}
+	}
+	
+	/**
+     *  Add Selection Column to first Tab
+     *  @param mField field
+    **/
+    protected void addSelectionColumn(GridField mField)
+    {
+        int displayLength = mField.getDisplayLength();
+        if (displayLength <= 0 || displayLength > FIELDLENGTH)
+            mField.setDisplayLength(FIELDLENGTH);
+        else
+            displayLength = 0;
+
+        //  Editor
+        WEditor editor = null;
+        editor = WebEditorFactory.getEditor(mField, false);
+        editor.setMandatory(false);
+        editor.setReadWrite(true);
+        editor.dynamicDisplay();
+        editor.addValueChangeListener(this);
+        editor.fillHorizontal();
+        Label label = editor.getLabel();
+        Component fieldEditor = editor.getComponent();
+
+        //
+        if (displayLength > 0)      //  set it back
+            mField.setDisplayLength(displayLength);
+        //
+
+        addSearchParameter(label, fieldEditor);
+        
+        editors.add(editor);
+
+        fieldEditor.addEventListener(Events.ON_OK,this);
+    }   // addSelectionColumn
+
+	protected void addSearchParameter(Label label, Component fieldEditor) {
+		Row panel = null;
+        if (parameterGrid.getRows().getChildren().isEmpty())
+        {
+        	panel = new Row();
+        	parameterGrid.getRows().appendChild(panel);
+        }
+        else
+        {
+        	panel = (Row) parameterGrid.getRows().getLastChild();
+        	if (panel.getChildren().size() >= 6)
+        	{
+        		panel = new Row();
+            	parameterGrid.getRows().appendChild(panel); 
+        	}
+        }
+        if (!(fieldEditor instanceof Checkbox))
+        {
+        	panel.appendChild(label.rightAlign());
+        } else {
+        	panel.appendChild(new Space());
+        }
+        panel.appendChild(fieldEditor);
+	}
+    
+    /**
+     *  Save Selection Details
+     *  Get Location/Partner Info
+     */
+    @Override
+    protected void saveSelectionDetail()
+    {
+        int row = contentPanel.getSelectedRow();
+        if (row == -1)
+            return;
+
+        int column = 0;
+        for(ColumnInfo columnInfo : columnInfos) 
+        {        	
+        	GridField field = columnInfo.getGridField();
+        	String columnName = field.getColumnName();
+        	if (columnInfo.getColClass().equals(KeyNamePair.class))
+        	{
+        		KeyNamePair knp = (KeyNamePair) contentPanel.getValueAt(row, column);
+        		Env.setContext(Env.getCtx(), p_WindowNo, Env.TAB_INFO, columnName, knp == null ? "0" : knp.getID());
+        	}
+        	else if (columnName.endsWith("_ID")) 
+        	{
+        		Object id = contentPanel.getValueAt(row, column);
+        		Env.setContext(Env.getCtx(), p_WindowNo, Env.TAB_INFO, columnName, id == null ? "0" : id.toString());
+        	}
+        	else
+        	{
+        		Object value = contentPanel.getValueAt(row, column);
+        		Env.setContext(Env.getCtx(), p_WindowNo, Env.TAB_INFO, field.getColumnName(), value == null ? "" : value.toString());
+        	}
+        	column++;
+        }
+    }   //  saveSelectionDetail
+    
+    private boolean isSearchLike(GridField field)
+	{
+		return DisplayType.isText(field.getDisplayType())
+		&& MColumn.isSuggestSelectionColumn(field.getColumnName(), true);
+	}
+
+	@Override
+	public void valueChange(ValueChangeEvent evt) {
+		if (evt != null && evt.getSource() instanceof WEditor)
+        {
+            WEditor editor = (WEditor)evt.getSource();
+            if (evt.getNewValue() == null)
+            	Env.setContext(infoContext, p_WindowNo, editor.getColumnName(), "");
+            else if (evt.getNewValue() instanceof Boolean)
+            	Env.setContext(infoContext, p_WindowNo, editor.getColumnName(), (Boolean)evt.getNewValue());
+            else if (evt.getNewValue() instanceof Timestamp)
+            	Env.setContext(infoContext, p_WindowNo, editor.getColumnName(), (Timestamp)evt.getNewValue());
+            else
+            	Env.setContext(infoContext, p_WindowNo, editor.getColumnName(), evt.getNewValue().toString());
+            
+            for(WEditor otherEditor : editors)
+            {
+            	if (otherEditor == editor) 
+            		continue;
+            	
+            	editor.dynamicDisplay();
+            }
+        }
+		
+	}    
+}