Fix bugs related to infinite scrool on archive pages and other tweaks