Added support for instant search