Resolved some listing clicking behaivor