data validation bug fixes