Dict search improved; Emms mark improved