Fix for buildFilterJoin() for CDD and join elements.