Moved logic for creating menu view model to query handler