Issue 218: Autoexpanding search Version 2