Improved behavior of filter field

Fixed #1928

review: @devoncarew
cc: @ussuri