Fixed autocompetion for module selector

Closes bug 1212271

Change-Id: I6c9419768b4670cf7c82a3b7e7fe65f7d6134909