Changed named query, added the limitation of result set