Added a filter to check the current user