more changes!

FIX: query hiding the wrong things