Temporarily removed query mapping functionality. For #37