fixed conditional showing of certain fields