Move search by name to enhanced search plugin.