Fixed the auto-complete menu for the constraints in case of redefinitions