Fixing empty values in search form