better handling for remote markers