Reorganise api search logic to account for network admin