fixes for id fields