Fixing chaining filter problem -> check to avoid NoneType comparison.