fixed databinding bugs