fix tag error and improve schedule popup