Bug Fix and Updated filters on protocols