Solving more ajax errors, cleaning up the task cards
Merge commit '10ed5e8233b27f87d9a736bb1244c6784b744261'