Merge pull request #45 from Asitha/mb-838

Fix for MB-838 Unable to browse queues when user has a domain name
code cleanup