FIxes related to EditorStatesComponent and repo search