Refactored the batch completion model [removing the unused code]
adding pagination to list location weights