added current user filter