Fix save query and hover style