|#607|+Shiha|Incorporating feedbacks and fixing bug for facility subsequent upload