[BUGFIX] Keep state of extendedSearch