Fix lists query