Fix dataviewhandler