Changed main archive query to make it more useful for assembly table