MVC model query interface restructure