changed format
separated query and index
added city