Display all visibility types on a junction field

Add the changes to 2.3 instead of master