fix tag error and improve schedule popup
regen for af9d234