fixed wrong styles when the table switchs geometry types CDB-1389
Merge CDB-1389 into release/2.14.2