ticket 1412: enhanced org auto compelte