Fix #185 but break -l with no query. :(