making table view much more robust