Members selecting a specific court to wait-list on

We have two different types of Indoor Courts: Regular Courts and Lesson Courts. Lesson courts are primarily used for lessons (since they are end courts and have curtains) but members can also book them if they are open or can wait-list for them. Currently, CR doesn't let people wait-list for a specific court number, only type of court. We have some members that only want to play on certain courts and they cannot request that online. We would like to see this changed so they can request them specifically online.