1412: Enhanced org auto complete