added missing @return
always use @DISPLAY@ for visible text

@LABEL@ workaround for dataplugin and static breaks default value
passing via url parameter
Merge pull request #63 from dom-mel/master

Always use @DISPLAY@ for visible label