WIP Sprint
Added Tenancy filter
Plan Selection