Search and server query now working
Merge branch 'master' of github.com:sugataa/bigdata_april2013