Add support for type of keyword selector, as per Issue #93