Worked a bit on the query for the homepage