added support for rows on query entry