Pooja/Naval: fixing some bugs on upload location