Feature/14 map api status errors