fixed non generic issue in top menu