fix collection helper

+ fix collection helper filters
+ fix template layout change for collection with contains "template"