[TIMOB-10464] Bug fix with slider and code cleanup