added model and / or where queries