fix instanceof checking for String
Merge branch 'layers' into simple-grid
working