WIP handle empty queries