Merged user queries
Upload added (but servlet not working)