Fixed multiple bugs with subrequirements