Added filter to hide already visited users, some refactoring