improve archive quote handling

see comments for more info