Fix bug with selection vs. tableview silliness