Updated searching mechanism for table view and future diagram