fix some regressions
#822 - remove some complexity, only 1 filter per call to retrieve, allow arrays as filter values