fixed conflict with popups and removed target highlight