[Cherry-pick]Update Taskboard Model & Queries