UpdateHistoryEntryCollection and query_history uncommented