Enhance class view &&  block query && block filter