Modified Filters for correct naming as per functionality