fixes for maintenance index and edit