Take in account old search settings #14