Oh! above issue is ready for testing, may be time to revert the search function hack/modification.