Leave properties used in any other index as null + added test