#66 remove this optimization as it requires to connect to more signals to get a proper update of the markers,...