Query traversal fix + a few handlers