Added new functionality to workaround native TableViewRow selection