Various improvements to conditional field display