NOJIRA Revert displayHelpers.php to pre-merge version. I assume the fixes in master-fix were specific for that branch and all of this has already been sorted out here in develop.