Fixed as per review comment from James
Unified singleclick internal method as per review from James
Unified singleclick internal method as per review from James