That will solve 1 part, the other is restricting them to the custom record and landing them there to begin with.