report & filter fixed