Removed the base entity from the subrequests, fixes #19