Refactors osp locations make_csv to just use a single query.