[PR] Change default archive queries for custom content types