navigation renamed, reordered and with Query9