Timestamp and filter generation fixes.