Fixed client-side task selection