fixed broken unit grid focus, closes #688