Fixed interactive/search issue