Add Script and Class filters logic