Filter Widget improvement