improve the current_user property filter