Added query_by_user