Added additional search fields