Better handling of empty filter values