Fix the handling of null solution filter