Palantir aug20 fixes

Needed Fixes  from PR #4481 for Palantir that weren't ready before preview branch was created.

@SebastianMarzjan 
Whole set:
https://github.com/Wikia/app/pulls?q=is%3Apr+label%3ADataAPI-Palantir-20-aug+