MVC query builder interface restructure