Add additonal checking on required terms included in a BeaconParser expression per #20