small improvements, now accepting root and wp-queries