add a better solution for 'Preventing auto-searches unless called explicitly'