Removing filter, small fixes