Fix Grid template (comment at top broke it)
Improve default value handling