add unfiltered flag
clean dictionary a bit