See #1352 - suggestions and record form fixes