Two query tab event handlers moved from Emma class