SONAR-5935 Better handling of keyboard for tags