Full working version of browsing and querying
Updated web.xml