Delete .index.html.swp
now fetches data as json
index takes query string
merge two brances