Add search form support