Further fixes on Selectable From
Add activity join conditionally & don't include fields by default