Fixed couple cases of missing run-id query constraint. Many more ...