Fix:top page filtering fix