added current user
fixed relation limit bug