For completeness/consistency I have also added @HQLQuery and deprecated @Loader.

And I added some proper tests for the functionality(there were none in the main test suite).

Unless anyone has objections to this change, I think this issue can be closed.