Filtering: Fix for nested filters, changing a child filter could result in infinite recursion in some cases, Fixes #628