Added joinable query param, and hardened api