Take out question marks in parameter names of all custom queries