Renaming 'tag' to 'term' and replacing constants with class variables with filters applied