Fixed up reactive queries