Select all Hajj except addon for Payment page Fixes #218