prepare fixes for article selectors and other renders
Merge conflicts