Don't include empty fields in filter query string, just to shorten it…

Don't include empty fields in filter query string, just to shorten it… #4378