Make feature highlight working for all geometry types