1. removed strange percents in lookup
2. insert parameter if only one on context