Added helper functions to ensure correct Id's were selected