Correct pseudo hashmap building on endless scrolling. fixes #20
Some tweaks