template selector fix ( actually adapts to saved template )