Added broken query handler and progress bezel along with code cleanups.