Prevent anything but boosters inside WAPs
Merge pull request #372 from yueh/fix-366

Prevent anything but boosters inside WAPs