Added email and date validation
FIXME: QueryHelper