Merge "Fix assigned node logic and filters"