Tweaked filter names + structure. #2659