Fixed broken grid name resolving