Add missing controllers and fix logic for web api