Hotfixes which fix Recommended section slowness