Table Search Fix