Restored git commit, with debug console logging for query and filters