fixed missing references and search