improved searching
improved searching