added query, fixed archive link