fix control query so it behaves now in features browser
tidy