Switched from FunctionalClass filter to NHS/Non-NHS boolean, updated filter urls