Fixing Bug and Adding ActionResolver headers