Refactor Keywords API into Question Engine API