Renames keywords to query
A couple more updates