Added conditional for formatting in Portal