1412: Enhanced org auto complete
Merge pull request #640 from ws6ramair/ticket_1412_org_auto_complete

Ticket 1412 org auto complete