Added several more codes to filter