handle id shortcut special case
fix multiline text handling
added whitespace remover (doing nothing atm)
Merge commit '8a11fa1ebab3cb59d8ba173bd04825a68e73afef'