full 1.7 update
fix NPE in lore expression