AutoJoin filter enhanced