Added filter state and renamed a couple of things