#352: Valerie: Query optimization

The commit messages say it all :)