Fix extended search