layout and filter improvements