refactorign to fix the confusion between first_seen and seen_at fields