fix(api,admin): various bug fixes and improvements for feasibility-aap

fix(api,admin): various bug fixes and improvements for feasibility-aap #4541