Shortcodes:
- regression fix from recent PL_Membership refactoring
- small fixes to shortcodes