Remove join to make pagination work