Fix popups after filter, file cleanup