Additional tweaks to Twitter module [#1014]