Add 'unknown' and 'timestamp' tags to ease querying. Tests.