make sure we are expanding json fields
removed barracuda stuff