Latest changes. No segfaults - but no execution either. Maybe the query just takes insanely long...