#70 refactored named query.