Fix property skipping. Preparations for new search.