Fix keyword extracting fail on empty tag. Refactor.
Merge branch 'ddi-rewrite' of https://github.com/kata-csc/ckanext-ddi into ddi-rewrite