Tab completion is too eager and omits valid entries

Tab complete is to eager to complete some entries. This is very confusing behaviour, as it gives the impression that there are no other valid entries. For example if I type:

/subsystem=datasources/d

And hit tab it will tab complete to:

/subsystem=datasources/data-source=java\:jboss\/datasources\/ExampleDS

There there are actually several other operations I may wish to do:

/subsystem=datasources/data-source=myDs:add
/subsystem=datasources/data-source=*:read-operation-description(name="add")

I think this is a major problem for the usability of the CLI, especially for new users.