fixed idiotic ranking heurisics
fixed bugs in latest iterator changes detected by random query evaluation test