fixes #6243 - making available module list org aware