Added preliminary search fields