JSON features added, fixes ported from promoter's internal version