Removed hasFilter boolean check