Fixed tree view filtering to work with the actual filters. **No Requirement Found message is behind**
Fixed merge conflict