Filter improvement.
Small improvements on menu.