Systems Nutupane - Minor tweaks to handle search persistance.