Removed round robin split step and abstract layering; random is almost
always preferred. Added query random split step