Refactor site catalog pk location