Incomplete improvements

It works with our current code: https://github.com/Adslot/direct-web/pull/3257