more tweaks to prevent different places from being marked as same