Performance/LIMIT fixes