+ fix model query