Fixes

No more empty resultsets