Restoring old mapping filter behaviour again