Update SHIVA code from Bill and disabling carriage returns in text fields in Shivanode edit form