white/black list added, support for abbr and accronym added