switched to IPagedResult instead of ResultSet
reorganized query extensions