added optional 'just_me' filter, removed as singleton