added support for non object selects