Merge "Refactor out LinkBatch related query building"