small changes to unfolder
changes in pushtypes -> for example with URI with multiple variables