search improved and representation changed