changing my mind on nav/query form stuff