Add 60-second Mode and fix searching problem