Adding query controller bits