add keyword extraction to entity extraction, simplify query options