fixed wrong queries duplicating forks