fixed date format for HQL
Added missing imports