Added slightly better filtering to ignore timestamps.