Add keywords, remove extract logic from lib.
Fix broken model-nok previously implicit.
Merge branch 'develop' of github.com:ministryofjustice/tribunals_api into develop