fixed npe on backspace in filter
trigger refresh on model update
fixed merge conflicts