Current tab selection fixed

Current tab selection fixed