Fix View Team/User & Timezone PR

Fix the previous pull request