BS-7563, Added missing indexes on H2