Added solution filtering