fix mm and new query