add support for SELECT *, performance improvement