Feature/eng 266 maaz homepage fix