Terms added are in the mapped state too.
"&|!" are now escaped too.
Improved trace log output.