fixed couple issues with datavirt-ui