support searching on any combination of tag and context, and misc tweaks