Refactoring + 'Advanced search': up-to-date default value