getTop feature related fixes