added orderBy and limit support