presentation made data source sensitive, various fixes