Add predicate to check if org is restricted
Show subprojects as well as top projects
HOLD and WAIT are separate tags