Try a fix on working_set filtering