Organization and keyword hierarchy fixes