Fixes: #2552 class_filter should follow code guidelines