Fix double-loop-messing-with-each-other bug on homepage