Added some things, fixed weird Filter button change.