Updated Query-Ids and Query-Keywords to the point of basic functionality.