More changes to filtering
rename of the hql script