fix event propgation issue, also add random image tag