BuildcompletionLists now adds proper param and local values including result