popup/history issue fixed