Fixed a misspelling in item name.
Cleaned up all HQL.