fixed filtering problem
label fixes