fixed hql and principal sql.
removed adminKit template