Added glimpse & fixed search