Added search box field support
Updated