correct bad use of returned value of function
get back to generic upgrade/search functions