Fix instance plurals and missing Tablet records