Updated keyword filtering