Added flag for enabled extended search