Added a bit of sorting for the host homes
Merge branch 'development'