-- Fix search issue with table number