Updated table search with scope