Finish when_rendering block

Prior to this commit not elements rendered in the correct way
This commit adds support for all the current arguments except
content_diff