Fix whitespaces and indent
Add a new parameter to return all aliases, including hosts. It fixes #2941