Modify display tpl to check markup as per commit upstream.