Fixing awesome bar query
Random Konrad changes; I haven't looked at them