Fixed Mvc controllers registration. Minor ES fixes.