add search arguments to results and bug fixes