Feature/ng toolbar save query