Updates based on UI changes and some edits for clarification
spaces, include account_id & space_type
templates, include account_id