DataQuery updated for keyword