1412: Added enhanced org completion logic