Fixed Warning on site & changed Filter