Merge pull request #881 from AladW/search-table