fix NA values in gfilter, date, boolean
add clear button
add clear button to choice item
merge changes