Fix rendering issues in remote_data