search.py changed for include_lm, (not backward compatible)