Be a bit more lenient on whether * is included in controlname