fix to properly return data on default queries