This has been implemented via Feature: 2 NAP Limit, please provide any further feedback there.
I’m closing this thread to “release” the votes.
@HFO, feel free to create a new thread for the separate additions/improvements you described.
Thanks, everybody.