Fixing annotation query