- Better handling of time-based queries - Better handling of errors detecting machine topology Fixes #7906