TA-0011: Fixing issue on IndexController, admin module