Modified query model for States in the frontend