Corrections to restricted_to logic
Couple front end fixes meow