some minor tweaks, e.g. nosuchfilter error handling