fix the issues present in api po in ui po as well
fix the issues present in api po in ui po as well

wwitzel3/awx,snahelou/awx,wwitzel3/awx,snahelou/awx,wwitzel3/awx,snahelou/awx,snahelou/awx,wwitzel3/awx