Forked to add results diversity features