Resolves issues/ requests:
https://github.com/joomlaworks/k2-v3-dev-build/issues/62
https://github.com/joomlaworks/k2-v3-dev-build/issues/63