Added basename to details
Fix: Options for filter parsed better