Replace some default query values for heroku