Adapted filter to new layout