linting and added filter states