Fix #4 more detailed autosearch