mustache fixes
improved scope path finding for mustache