Fix logic of ordering --local against host declarations
Fix displaying the same batch of results over and over again.