Cleaned up User.java notifications query