Fixed search fields bug