New fixed table and fixed the auto search