fix archiving and force query