Add more search fields