Reorganization and allow conditional filtering for certain words