view change and filter fix