Better handleShowMoreClick callback

Change-Id: I9d0b22195b69c17940db07268c0f619559c79b2d