Improve 'click' and 'text' compatibility