Added filtering for states