simplify query (remove LIMIT)