Add keyword field to query builder, close #4.