Working on api cors issue
Fixing api bug