Rename Grid to Pagination and add hql support