Widget option fix and better filter representation