Better position of the filter, so new contexts/connectors can still be excluded/ignored
Do not issue a log action if the filtered data is empty
Filter snake case, some CS fixes